Fixed keyword search
Implemeted tests
Added test-www make target
Optimized searches