Fixed form a bit more with remote true and fields