Use _.pick instead of _.omit when serializing Entity objects
Minor form cleanup