extract matching of symbols (#cleanup)
extract symbol getting and setting (#cleanup)
better name for string in Query class(#cleanup)