moved fluid dependency to main block instead of 'dev' block
refactored search module to be namespaced and cleanly decomposed child functions