Added basic pagination support
Fixed search specs