FAIMS-378 - fix the query and add ability to delete record from the map