modificat alarm query like in =