Some bugs fixes, cleaner code search form added