Fix #1773 + Form plugin style fixes + REST API fix query param

Fix #1773