Issue #2489394 by cr0ss, jhodgdon, Cottser: Refactor the Search module markup to be inline with our standards