Fixed quotes and ordering