layout changes and fixed tag search