*made queries more powerful and useful across types.
*broke nor queriy -- TODO - Fixme.