Fixes from git.lc project.#19

Gormartsen wants to merge 1 commit intomasteritpatrol/formfilterapi:masterfrom

codereview-5ffec7a05f61ade60300c12eaa4edfa420f8de7ditpatrol/formfilterapi:codereview-5ffec7a05f61ade60300c12eaa4edfa420f8de7dCopy head branch name to clipboard