Fixed new interception points amd better lucene indexing and also some more logic on sort of pages