fixed order retrieval
added authenticated check