committing some fixing for higher browse all performance and error in sorting