Prioritize custom messages in the schema higher

Ensure manual messages entered into schema are used before the
generic per type messages