Add support for hex values in query #138