Added keyword search
Fixed generation of pagination urls