updates to work better with app server
index sorting