Improved indexing
Fixed default sort placeholder