Removed / Commented out search for subjects to simplify search. Temporary fix