advanced search partially implemented
conflicts solved? o.o