fixed getById
mergedd