grid button fix, search tempaltes changes