All sorting added, new boom option and search