fixed ISSUE-44089: remove Heartbeat Custom queries

Merged Asier Lostalé requested to merge (removed):fix/44089-hb into master