Index view fixes