Refactoring for Alarm search, added search by tag