Organizing and conditions for easier search and edit