feat(SW-1773): add proper validation to form and query Approved-by: Linus Flood Approved-by: Chuma Mcphoy (We Ahead)