[message_store] fixing query service