Tweaks to search css when no javascript

Change-Id: I5ca37912aa998d2ab4d4f5b6f37c8af7a5e9b00c