LPS-44876 Alloy Controller - improved search to account for advanced search