added more sections and fixed search issue