Indexserver skip irrelevant items

contains an unrelated unit test fix