Fix issue where site filter query is not applied if the requested number of results is 0
Make xinclude files symbolic links pointing to product catalog