Speed up search
Fix typo
Put ERB in its right place
Speed up search some more