Search still broken but making progress
Fixed date search, refactored and made work with both OWB and Weld