..and yes, this area of the code is horrible and I was afraid to refactor more, thinking that this code is just a temporary improvement until Scala Search takes over..