[FT-319] Code simplification.

Use `between` hql operator instead of  `<=` and `>=`