Advanced search interface coming up.
Advanced search form coming up + silly merge
Advanced search form coming up
Merge branch 'haku-js' into development