bugfix-without-timetable adn other
Merge pull request #115 from dentrifonov/#107-search-window

bugfix-without-timetable and other