More tweaks in return results