added support for querying /rising and /hot, cleaned code