Reinstate search changes from develop merge
Reinstate search changes from develop merge

aboire/meteor-bootstrap-magic,aboire/meteor-bootstrap-magic,TAPevents/meteor-bootstrap-magic,TAPevents/meteor-bootstrap-magic