Fixed issue with update on find/filter and some bugfixes