form-builder improvements (add filters for lookups)