Reworked search DSL to bring in line with other style. Added initial tests.