Ammet added to query
Merged commit