If the property already contains 's' in the end, do not add a new one
Fix boolean handling