Refactor tickets

where or find with more preference to latter