Add more restrictions
Actually work, remove quotes and escaping