Continued implementing advanced-search style.
Finished implementing the advanced search template (not 100% accurate yet).
Merge remote-tracking branch 'origin/master'