Adapts tests to change in stock layout file
Adds "prefetch" to "next" link and adapts tests
Changes search filter to allow integration into the whole filter client