Improved search support

Still not done
Moar strings