add some constrains on the query and prevent timestamp int being placed ...

...in fields