Removed space as a separator, and added trim for tolerance. Fixed the handler return value, which broke stuff