fixed search for current form on edition mode
Merge remote-tracking branch 'origin/master'