Raman - Refactored active facility parameterized query