First pass at advanced search screen and limiters.
merging
cleaning up